Merge from trunk
authorStefan Monnier <monnier@iro.umontreal.ca>
Sun, 25 Mar 2012 20:37:21 +0000 (16:37 -0400)
committerStefan Monnier <monnier@iro.umontreal.ca>
Sun, 25 Mar 2012 20:37:21 +0000 (16:37 -0400)
commitb71bc127b50cb6e3fd280b6d9e1f6f48e18927b3
tree53d03839df7ad085b29ea91e54bf0b605e74b910
parentc71b47f0b20cec0d079d7a0d28703c70349ab8c8
parentc77e3612b4d945388cfdc4c6d583feb4b23fec55
Merge from trunk
lisp/ChangeLog
lisp/emacs-lisp/smie.el
lisp/newcomment.el
lisp/ses.el